From: Linus Torvalds Date: Tue, 20 Sep 2011 17:28:52 +0000 (-0700) Subject: Merge git://git.samba.org/sfrench/cifs-2.6 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~12755 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2838888f3f268344d42ac088c8abcff91c505ced;p=linux-4.9.git Merge git://git.samba.org/sfrench/cifs-2.6 * git://git.samba.org/sfrench/cifs-2.6: cifs: Fix broken sec=ntlmv2/i sec option (try #2) Fix the conflict between rwpidforward and rw mount options CIFS: Fix ERR_PTR dereference in cifs_get_root cifs: fix possible memory corruption in CIFSFindNext --- 2838888f3f268344d42ac088c8abcff91c505ced